From 9ba9374722d347db3f183745c3b255ce4b78d0c4 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 7 Aug 2012 23:52:54 +0200 Subject: [PATCH] * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of a defcustom that is quoted with backquote. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/lisp-mode.el | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 635456adfd2..ea1c5f8f33e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-08-07 Andreas Schwab + * emacs-lisp/lisp-mode.el (eval-defun-1): Handle standard value of + a defcustom that is quoted with backquote. + * calc/calc-prog.el (math-do-defmath): Use backquote forms. Fix handling of interactive spec when the body uses return. (math-do-arg-check, math-define-function-body): Use backquote forms. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 7e9dd9e6cfe..99677551a47 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -776,7 +776,9 @@ Reinitialize the face according to the `defface' specification." (default-boundp (eval (nth 1 form) lexical-binding))) ;; Force variable to be bound. (set-default (eval (nth 1 form) lexical-binding) - (eval (nth 1 (nth 2 form)) lexical-binding)) + ;; The value may be quoted with quote or backquote. + (eval (eval (nth 2 form) lexical-binding) + lexical-binding)) form) ;; `defface' is macroexpanded to `custom-declare-face'. ((eq (car form) 'custom-declare-face) -- 2.30.2